From: Tim Lunn <tim@feathertop.org>
Date: Thu, 18 Oct 2012 23:44:28 +0000 (+1100)
Subject: screenShield: explicitly load gnome-screensaver in fallback mode.
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5571
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=418cf6281e26cad424256bc2108e2957afd2f77e;p=gnome-shell.git

screenShield: explicitly load gnome-screensaver in fallback mode.

When running gnome-shell from lightDM, gnome-screensaver is no
longer auto-loaded. As a result the dbus calls for Lock user etc
will fail.

https://bugzilla.gnome.org/show_bug.cgi?id=683060
Bug-Ubuntu: https://launchpad.net/bugs/1064354
---

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index e10ef346b..4d60f71aa 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -21,6 +21,7 @@ const Overview = imports.ui.overview;
 const MessageTray = imports.ui.messageTray;
 const ShellDBus = imports.ui.shellDBus;
 const Tweener = imports.ui.tweener;
+const Util = imports.misc.util;
 
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOCK_ENABLED_KEY = 'lock-enabled';
@@ -866,6 +867,8 @@ const ScreenShieldFallback = new Lang.Class({
     Name: 'ScreenShieldFallback',
 
     _init: function() {
+        Util.spawn(['gnome-screensaver']);
+
         this._proxy = new Gio.DBusProxy({ g_connection: Gio.DBus.session,
                                           g_name: 'org.gnome.ScreenSaver',
                                           g_object_path: '/org/gnome/ScreenSaver',